diff --git a/flake.lock b/flake.lock
index cea1c51..b4cbd30 100644
--- a/flake.lock
+++ b/flake.lock
@@ -405,11 +405,11 @@
         "pre-commit-hooks": "pre-commit-hooks_3"
       },
       "locked": {
-        "lastModified": 1703206032,
-        "narHash": "sha256-hCuX9y1lUwa8Ck0jruebL2YLhwnDunav/uiIp9EvmNc=",
+        "lastModified": 1703273523,
+        "narHash": "sha256-YG/KXGLR4wkiJidX8MtunXOlSsR8tgqwkfQnS3Xe1Jk=",
         "owner": "oddlama",
         "repo": "nixos-extra-modules",
-        "rev": "073a8ae3b34ed85619dd22bba0d4fb6b6e8e14d1",
+        "rev": "5072dd354d2dd3bfead36c9269c34ed00d0f3fdd",
         "type": "github"
       },
       "original": {
diff --git a/hosts/kroma/default.nix b/hosts/kroma/default.nix
index 9754cfe..242e0c3 100644
--- a/hosts/kroma/default.nix
+++ b/hosts/kroma/default.nix
@@ -18,7 +18,6 @@
     ../../modules/optional/hardware/bluetooth.nix
 
     ../../modules
-    ../../modules/optional/boot-efi.nix
     ../../modules/optional/initrd-ssh.nix
     ../../modules/optional/dev
     ../../modules/optional/graphical
@@ -32,6 +31,7 @@
     ./net.nix
   ];
 
+  boot.mode = "efi";
   boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
   boot.binfmt.emulatedSystems = ["aarch64-linux"];
 }
diff --git a/hosts/nom/default.nix b/hosts/nom/default.nix
index d776ceb..87b6247 100644
--- a/hosts/nom/default.nix
+++ b/hosts/nom/default.nix
@@ -12,7 +12,6 @@
     ../../modules/optional/hardware/physical.nix
 
     ../../modules
-    ../../modules/optional/boot-efi.nix
     ../../modules/optional/initrd-ssh.nix
     ../../modules/optional/dev
     ../../modules/optional/graphical
@@ -26,6 +25,7 @@
     ./net.nix
   ];
 
+  boot.mode = "efi";
   boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
 
   console = {
diff --git a/hosts/sentinel/default.nix b/hosts/sentinel/default.nix
index 9e82750..34324ec 100644
--- a/hosts/sentinel/default.nix
+++ b/hosts/sentinel/default.nix
@@ -3,7 +3,6 @@
     ../../modules/optional/hardware/hetzner-cloud.nix
 
     ../../modules
-    ../../modules/optional/boot-bios.nix
     ../../modules/optional/initrd-ssh.nix
     ../../modules/optional/zfs.nix
 
@@ -13,6 +12,7 @@
     ./oauth2.nix
   ];
 
+  boot.mode = "bios";
   users.groups.acme.members = ["nginx"];
   services.nginx.enable = true;
 
diff --git a/hosts/ward/default.nix b/hosts/ward/default.nix
index a8d9bd4..ac0abd6 100644
--- a/hosts/ward/default.nix
+++ b/hosts/ward/default.nix
@@ -13,7 +13,6 @@
     ../../modules/optional/hardware/physical.nix
 
     ../../modules
-    ../../modules/optional/boot-efi.nix
     ../../modules/optional/initrd-ssh.nix
     ../../modules/optional/zfs.nix
 
@@ -22,6 +21,7 @@
     ./kea.nix
   ];
 
+  boot.mode = "efi";
   boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" "r8169"];
 
   meta.promtail = {
diff --git a/hosts/zackbiene/default.nix b/hosts/zackbiene/default.nix
index ad3e850..b17d633 100644
--- a/hosts/zackbiene/default.nix
+++ b/hosts/zackbiene/default.nix
@@ -11,7 +11,6 @@ in {
     ../../modules/optional/hardware/odroid-n2plus.nix
 
     ../../modules
-    ../../modules/optional/boot-efi.nix
     ../../modules/optional/initrd-ssh.nix
     ../../modules/optional/zfs.nix
 
@@ -25,6 +24,7 @@ in {
     #./zigbee2mqtt.nix
   ];
 
+  boot.mode = "efi";
   users.groups.acme.members = ["nginx"];
   services.nginx.enable = true;
 
diff --git a/modules/guests/microvm.nix b/modules/guests/microvm.nix
index 24d77c0..25aa2d9 100644
--- a/modules/guests/microvm.nix
+++ b/modules/guests/microvm.nix
@@ -32,7 +32,12 @@ in {
       hypervisor = mkDefault "qemu";
 
       # Give them some juice by default
-      # TODO
+      # TODO     aaaaaaaaaaaaaaaaaaaaaaaaaaa
+      # TODO     aaaaaaaaaaaaaaaaaaaaaaaaaaa
+      # TODO     aaaaaaaaaaaaaaaaaaaaaaaaaaa
+      # TODO     aaaaaaaaaaaaaaaaaaaaaaaaaaa
+      # TODO     aaaaaaaaaaaaaaaaaaaaaaaaaaa
+      # TODO     aaaaaaaaaaaaaaaaaaaaaaaaaaa
       mem = mkDefault 1024;
 
       # Add a writable store overlay, but since this is always ephemeral
diff --git a/modules/optional/boot-bios.nix b/modules/optional/boot-bios.nix
deleted file mode 100644
index c8d47a6..0000000
--- a/modules/optional/boot-bios.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  boot.loader.grub = {
-    enable = true;
-    efiSupport = false;
-    configurationLimit = 32;
-  };
-}
diff --git a/modules/optional/boot-efi.nix b/modules/optional/boot-efi.nix
deleted file mode 100644
index 6765bee..0000000
--- a/modules/optional/boot-efi.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  boot.loader = {
-    systemd-boot.enable = true;
-    systemd-boot.configurationLimit = 32;
-    efi.canTouchEfiVariables = true;
-  };
-}