diff --git a/hosts/yodaGaming/configuration.nix b/hosts/yodaGaming/configuration.nix
index 87a7df0..6ae96e2 100644
--- a/hosts/yodaGaming/configuration.nix
+++ b/hosts/yodaGaming/configuration.nix
@@ -6,6 +6,7 @@
       ../../modules/home-manager.nix
       ../../modules/nur-and-unstable.nix
       ../../modules/base.nix
+      ../../modules/base-bios.nix
       ../../modules/power-management.nix
       ../../modules/ntfs.nix
       ../../modules/ssh-fde-unlock.nix
@@ -36,6 +37,9 @@
   yoda.btrfsFileSystems = ["/"];
   #yoda.btrfsMounts = yoda.btrfsFileSystems;
 
+  # BIOS
+  boot.loader.grub.devices = ["/dev/disk/by-uuid/c033a402-8616-4aa7-922e-556f60a64a6c"];
+
   # List all available kernel versions:
   #   `nix repl` -> `:l <nixpkgs>` -> `pkgs.linuxPackages` and press `TAB`
   # Default.
diff --git a/hosts/yodaHedgehog/configuration.nix b/hosts/yodaHedgehog/configuration.nix
index cb04088..f1ae569 100644
--- a/hosts/yodaHedgehog/configuration.nix
+++ b/hosts/yodaHedgehog/configuration.nix
@@ -7,6 +7,7 @@
       ../../modules/home-manager.nix
       ../../modules/nur-and-unstable.nix
       ../../modules/base.nix
+      ../../modules/base-efi.nix
       ../../modules/headless.nix
 
       ../../modules/ssh-fde-unlock.nix
diff --git a/hosts/yodaNas/configuration.nix b/hosts/yodaNas/configuration.nix
index 66f1ae4..4a244dd 100644
--- a/hosts/yodaNas/configuration.nix
+++ b/hosts/yodaNas/configuration.nix
@@ -7,6 +7,7 @@
       ../../modules/home-manager.nix
       ../../modules/nur-and-unstable.nix
       ../../modules/base.nix
+      ../../modules/base-efi.nix
       ../../modules/headless.nix
 
       ../../modules/ssh-fde-unlock.nix
diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix
index d252aaa..c7316ca 100644
--- a/hosts/yodaTab/configuration.nix
+++ b/hosts/yodaTab/configuration.nix
@@ -6,6 +6,7 @@
       ../../modules/home-manager.nix
       ../../modules/nur-and-unstable.nix
       ../../modules/base.nix
+      ../../modules/base-efi.nix
       ../../modules/power-management.nix
       ../../modules/ntfs.nix
       ../../modules/git.nix
diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix
index ca6311c..6deb5e1 100644
--- a/hosts/yodaTux/configuration.nix
+++ b/hosts/yodaTux/configuration.nix
@@ -6,6 +6,7 @@
       ../../modules/home-manager.nix
       ../../modules/nur-and-unstable.nix
       ../../modules/base.nix
+      ../../modules/base-efi.nix
       ../../modules/power-management.nix
       ../../modules/tuxedo-rs.nix
       ../../modules/ntfs.nix
diff --git a/hosts/yodaYoga/configuration.nix b/hosts/yodaYoga/configuration.nix
index 0c0ffaa..c7f8136 100644
--- a/hosts/yodaYoga/configuration.nix
+++ b/hosts/yodaYoga/configuration.nix
@@ -7,6 +7,7 @@
       ../../modules/home-manager.nix
       ../../modules/nur-and-unstable.nix
       ../../modules/base.nix
+      ../../modules/base-efi.nix
       ../../modules/headless.nix
 
       ../../modules/ssh-fde-unlock.nix
diff --git a/modules/base-bios.nix b/modules/base-bios.nix
new file mode 100644
index 0000000..ed429bc
--- /dev/null
+++ b/modules/base-bios.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+{
+  # Bootloader.
+  boot.loader.grub = {
+    # This has to be filled out in config.nix:
+    #   devices = [ "/dev/disk/by-uuid/..." ];
+    efiSupport = true;
+    efiInstallAsRemovable = true;
+  };
+}
diff --git a/modules/base-efi.nix b/modules/base-efi.nix
new file mode 100644
index 0000000..02a80da
--- /dev/null
+++ b/modules/base-efi.nix
@@ -0,0 +1,6 @@
+{ config, pkgs, ... }:
+{
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+}
diff --git a/modules/base.nix b/modules/base.nix
index 278b790..d6948e8 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -14,10 +14,6 @@
   # Allow unfree packages.
   nixpkgs.config.allowUnfree = false;
 
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   # Enables wireless support via wpa_supplicant.
   # networking.wireless.enable = true;