diff --git a/flake.nix b/flake.nix
index f45828db..2143fe0c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,14 +23,7 @@
   };
 
   outputs =
-    {
-      agenix,
-      disko,
-      nixos-hardware,
-      nixpkgs,
-      self,
-      ...
-    }@inputs:
+    { nixpkgs, self, ... }@inputs:
     let
       inherit (self) outputs;
 
@@ -81,13 +74,6 @@
           };
 
           modules = [
-            agenix.nixosModules.default
-            nixos-hardware.nixosModules.common-cpu-intel
-            nixos-hardware.nixosModules.common-gpu-intel
-            nixos-hardware.nixosModules.common-pc-laptop
-            nixos-hardware.nixosModules.common-pc-laptop-hdd
-            nixos-hardware.nixosModules.system76
-
             ./hosts/lemp11/configuration.nix
           ];
         };
@@ -99,8 +85,6 @@
           };
 
           modules = [
-            agenix.nixosModules.default
-
             ./hosts/nixedo/configuration.nix
           ];
         };
@@ -112,10 +96,6 @@
           };
 
           modules = [
-            agenix.nixosModules.default
-            nixos-hardware.nixosModules.common-gpu-intel
-            nixos-hardware.nixosModules.lenovo-thinkpad-t480
-
             ./hosts/t480/configuration.nix
           ];
         };
@@ -127,10 +107,6 @@
           };
 
           modules = [
-            agenix.nixosModules.default
-            nixos-hardware.nixosModules.common-gpu-intel
-            nixos-hardware.nixosModules.lenovo-thinkpad-t490
-
             ./hosts/t490/configuration.nix
           ];
         };
@@ -144,10 +120,6 @@
           };
 
           modules = [
-            agenix.nixosModules.default
-            disko.nixosModules.disko
-            inputs.nixos-wsl.nixosModules.default
-
             ./hosts/PW05CH3L/configuration.nix
           ];
         };
diff --git a/hosts/PW05CH3L/configuration.nix b/hosts/PW05CH3L/configuration.nix
index 45b8f8e1..a6c1b52b 100644
--- a/hosts/PW05CH3L/configuration.nix
+++ b/hosts/PW05CH3L/configuration.nix
@@ -1,7 +1,11 @@
-{ pkgs, ... }:
+{ inputs, pkgs, ... }:
 
 {
   imports = [
+    inputs.agenix.nixosModules.default
+    inputs.disko.nixosModules.disko
+    inputs.nixos-wsl.nixosModules.default
+
     ../common
 
     ../../users/opdavies.nix
diff --git a/hosts/lemp11/configuration.nix b/hosts/lemp11/configuration.nix
index 3b3ac5ce..88336c16 100644
--- a/hosts/lemp11/configuration.nix
+++ b/hosts/lemp11/configuration.nix
@@ -1,7 +1,14 @@
-{ pkgs, ... }:
+{ inputs, pkgs, ... }:
 
 {
   imports = [
+    inputs.agenix.nixosModules.default
+    inputs.nixos-hardware.nixosModules.common-cpu-intel
+    inputs.nixos-hardware.nixosModules.common-gpu-intel
+    inputs.nixos-hardware.nixosModules.common-pc-laptop
+    inputs.nixos-hardware.nixosModules.common-pc-laptop-hdd
+    inputs.nixos-hardware.nixosModules.system76
+
     ../common
     ./hardware-configuration.nix
     ./programs.nix
diff --git a/hosts/nixedo/configuration.nix b/hosts/nixedo/configuration.nix
index c548733f..8395b58b 100644
--- a/hosts/nixedo/configuration.nix
+++ b/hosts/nixedo/configuration.nix
@@ -2,10 +2,12 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ pkgs, ... }:
+{ inputs, pkgs, ... }:
 
 {
   imports = [
+    inputs.agenix.nixosModules.default
+
     ../common
     ./hardware-configuration.nix
     ./homelab.nix
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index e08b947a..0aca1bf9 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -1,7 +1,11 @@
-{ pkgs, ... }:
+{ inputs, pkgs, ... }:
 
 {
   imports = [
+    inputs.agenix.nixosModules.default
+    inputs.nixos-hardware.nixosModules.common-gpu-intel
+    inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480
+
     ../common
 
     ./hardware-configuration.nix
diff --git a/hosts/t490/configuration.nix b/hosts/t490/configuration.nix
index 0a8ff092..fee2d4f1 100644
--- a/hosts/t490/configuration.nix
+++ b/hosts/t490/configuration.nix
@@ -1,5 +1,11 @@
+{ inputs, ... }:
+
 {
   imports = [
+    inputs.agenix.nixosModules.default
+    inputs.nixos-hardware.nixosModules.common-gpu-intel
+    inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t490
+
     ../common
 
     ./hardware-configuration.nix