diff --git a/hosts/firefly/system/default.nix b/hosts/firefly/system/default.nix
index 8e784e8..4f31c1d 100644
--- a/hosts/firefly/system/default.nix
+++ b/hosts/firefly/system/default.nix
@@ -9,8 +9,6 @@
     ../../../modules/system/desktop
     ../../../modules/system/programs
     ../../../modules/system/services
-    ../../../overlays
-    ../../../variables
 
     # Devices and hardware
     ../../../modules/system/devices
@@ -18,6 +16,10 @@
     ../../../modules/system/devices/video/nvidia
     ../../../modules/system/devices/networking/firewall/pc
 
+    # Misc
+    ../../../overlays
+    ../../../variables
+
     # Imports
     lanzaboote.nixosModules.lanzaboote
   ];
diff --git a/hosts/shuttleworth/system/default.nix b/hosts/shuttleworth/system/default.nix
index 3ade4f6..572ab93 100644
--- a/hosts/shuttleworth/system/default.nix
+++ b/hosts/shuttleworth/system/default.nix
@@ -1,4 +1,4 @@
-{ config, hardware, ... }:
+{ config, lib, hardware, ... }:
 {
   imports = [
     ./hardware
@@ -16,6 +16,10 @@
     ../../../modules/system/devices/networking/firewall/pc
     ../../../modules/system/devices/networking/wireguard/pc
 
+    # Extras
+    ../../../overlays
+    ../../../variables
+
     # Imports
     hardware.nixosModules.pine64-pinebook-pro
   ];