diff --git a/modules/boot.nix b/modules/boot.nix
index 69528e1..ec43ea5 100644
--- a/modules/boot.nix
+++ b/modules/boot.nix
@@ -3,14 +3,14 @@
   lib,
   ...
 }: {
-  option.boot.mode = lib.mkOption {
+  options.boot.mode = lib.mkOption {
     description = "Enable recommended Options for different boot modes";
     type = lib.types.nullOr (lib.types.enum ["bios" "efi" "secureboot"]);
     default = null;
   };
-  config = let
+  config.boot.loader = let
     bios-conf = {
-      boot.loader.grub = {
+      grub = {
         enable = true;
         efiSupport = false;
         configurationLimit = 32;
@@ -18,11 +18,9 @@
     };
     efi-conf = {
       # Use the systemd-boot EFI boot loader.
-      boot.loader = {
-        systemd-boot.enable = true;
-        systemd-boot.configurationLimit = 32;
-        efi.canTouchEfiVariables = true;
-      };
+      systemd-boot.enable = true;
+      systemd-boot.configurationLimit = 32;
+      efi.canTouchEfiVariables = true;
     };
   in
     lib.mkIf (config.boot.mode != null)