diff --git a/hosts/kitty/boot/default.nix b/hosts/kitty/boot/default.nix
index 4b9c8779..d67ce466 100644
--- a/hosts/kitty/boot/default.nix
+++ b/hosts/kitty/boot/default.nix
@@ -1,4 +1,7 @@
 { pkgs, ... }:
 {
-  boot.kernelPackages = pkgs.linuxPackages_5_15_hardened;
+  boot = {
+    kernelPackages = pkgs.linuxPackages_5_15_hardened;
+    loader.systemd-boot.enable = true;
+  };
 }
diff --git a/hosts/pear/boot/default.nix b/hosts/pear/boot/default.nix
index 20cd04b8..3cf63f7f 100644
--- a/hosts/pear/boot/default.nix
+++ b/hosts/pear/boot/default.nix
@@ -2,6 +2,7 @@
 {
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
+    loader.systemd-boot.enable = true;
     plymouth.enable = true;
   };
 }
diff --git a/hosts/prophet/boot/default.nix b/hosts/prophet/boot/default.nix
index 3efdde2c..e21b5c06 100644
--- a/hosts/prophet/boot/default.nix
+++ b/hosts/prophet/boot/default.nix
@@ -1,4 +1,7 @@
 { pkgs, ... }:
 {
-  boot.kernelPackages = pkgs.linuxPackages_hardened;
+  boot = {
+    kernelPackages = pkgs.linuxPackages_hardened;
+    loader.systemd-boot.enable = true;
+  };
 }
diff --git a/hosts/tower/filesystems/default.nix b/hosts/tower/filesystems/default.nix
index 74490d4f..493e929b 100644
--- a/hosts/tower/filesystems/default.nix
+++ b/hosts/tower/filesystems/default.nix
@@ -17,14 +17,6 @@
       fsType = "ext4";
       options = [ "nosuid" "nodev" "nofail" "x-gvfs-show" ];
     };
-    "/mnt/Windows1" = {
-      device = "/dev/disk/by-uuid/48F5C6E06416229C";
-      options = [ "nosuid" "nodev" "noauto" ];
-    };
-    "/mnt/Windows2" = {
-      device = "/dev/disk/by-uuid/0A5A3420237C863A";
-      options = [ "nosuid" "nodev" "noauto" ];
-    };
 
     # Bulk storage mounts
     "/persist/var/lib/libvirt" = {
diff --git a/modules/system/devices/boot/lanzaboote/default.nix b/modules/system/devices/boot/lanzaboote/default.nix
index 3f117109..9556561c 100644
--- a/modules/system/devices/boot/lanzaboote/default.nix
+++ b/modules/system/devices/boot/lanzaboote/default.nix
@@ -3,7 +3,6 @@
   imports = [ lanzaboote.nixosModules.lanzaboote ];
 
   boot = lib.mkIf config.boot.lanzaboote.enable {
-    loader.systemd-boot.enable = lib.mkForce false;
     lanzaboote.pkiBundle = "/etc/secureboot";
   };
 
diff --git a/modules/system/devices/boot/systemd/default.nix b/modules/system/devices/boot/systemd/default.nix
index 8bada39c..45ab8e62 100644
--- a/modules/system/devices/boot/systemd/default.nix
+++ b/modules/system/devices/boot/systemd/default.nix
@@ -1,7 +1,6 @@
-{ ... }:
+{ config, lib, ... }:
 {
-  boot.loader.systemd-boot = {
-    enable = true;
+  boot.loader.systemd-boot = lib.mkIf config.boot.loader.systemd-boot.enable {
     editor = false;
     graceful = true;
   };