diff --git a/modules/core/config.nix b/modules/core/config.nix
index bf92a17..81fe41e 100644
--- a/modules/core/config.nix
+++ b/modules/core/config.nix
@@ -6,13 +6,22 @@
 }:
 let
   cfg = config.homelab.core;
-
   allowRootSSH = if cfg.ssh.permitRootLogin then "yes" else "no";
 in
 {
 
   config = {
-    boot.kernelPackages = shared.kernelOptions.${cfg.kernel};
+    boot = {
+      kernelPackages = shared.kernelOptions.${cfg.kernel};
+      loader = {
+        grub = {
+          enable = true;
+          device = "nodev";
+          efiSupport = true;
+        };
+        efi.canTouchEfiVariables = true;
+      };
+    };
 
     time.timeZone = "America/Chicago";
 
@@ -89,24 +98,6 @@ in
         settings.PermitRootLogin = allowRootSSH;
       };
     };
-
     system.stateVersion = "26.11";
-
-    boot.loader =
-      if cfg.bootloader.type == "grub" then
-        {
-          grub = {
-            enable = cfg.bootloader.grub.enable;
-            device = cfg.bootloader.grub.device;
-          };
-
-          systemd-boot.enable = false;
-        }
-      else
-        {
-          systemd-boot.enable = cfg.bootloader.systemd.enable;
-
-          grub.enable = false;
-        };
   };
 }
diff --git a/modules/core/options.nix b/modules/core/options.nix
index f9f9019..6f74ed8 100644
--- a/modules/core/options.nix
+++ b/modules/core/options.nix
@@ -11,54 +11,6 @@
       description = "The kernel of the machine";
     };
 
-    bootloader = {
-      type = lib.mkOption {
-        type = lib.types.enum [
-          "grub"
-          "systemd"
-        ];
-        default = "grub";
-        description = "Which bootloader to use (grub or systemd-boot)";
-      };
-
-      grub = lib.mkOption {
-        type = lib.types.submodule {
-          options = {
-            enable = lib.mkOption {
-              type = lib.types.bool;
-              default = false;
-            };
-
-            device = lib.mkOption {
-              type = lib.types.str;
-              default = "nodev";
-              description = "Device to install GRUB on";
-            };
-          };
-        };
-        default = { };
-        description = "GRUB configuration block";
-      };
-
-      systemd = lib.mkOption {
-        type = lib.types.submodule {
-          options = {
-            enable = lib.mkOption {
-              type = lib.types.bool;
-              default = false;
-            };
-
-            efiSupport = lib.mkOption {
-              type = lib.types.bool;
-              default = true;
-            };
-          };
-        };
-        default = { };
-        description = "systemd-boot configuration block";
-      };
-    };
-
     user = {
       name = lib.mkOption {
         type = lib.types.str;