diff --git a/hosts/cnixpad/modules.nix b/hosts/cnixpad/modules.nix
index abf2ea61..f374b343 100644
--- a/hosts/cnixpad/modules.nix
+++ b/hosts/cnixpad/modules.nix
@@ -2,8 +2,12 @@
   system = {
     boot = {
       loader = {
-        default.enable = true;
-        lanzaboote.enable = false;
+        default = {
+          enable = true;
+        };
+        lanzaboote = {
+          enable = false;
+        };
       };
       kernel = {
         variant = "stable";
diff --git a/hosts/default.nix b/hosts/default.nix
index 58034956..50ea01cd 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -59,6 +59,7 @@
               extraSpecialArgs = specialArgs;
             };
           }
+          self.nixosModules.system
           inputs.chaotic.nixosModules.default
           inputs.agenix.nixosModules.default
         ];
@@ -76,6 +77,7 @@
               extraSpecialArgs = specialArgs;
             };
           }
+          self.nixosModules.system
           inputs.chaotic.nixosModules.default
           inputs.agenix.nixosModules.default
         ];
diff --git a/users/cnst/modules.nix b/users/cnst/modules.nix
index 67805eda..cef32c95 100644
--- a/users/cnst/modules.nix
+++ b/users/cnst/modules.nix
@@ -69,7 +69,6 @@
       gpg = {
         enable = false;
       };
-
       mako = {
         enable = true;
       };