diff --git a/flake.nix b/flake.nix
index e1635813..e0e28421 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,6 +67,9 @@
         nodeNixpkgs.jupiter = import unstable { system = "x86_64-linux"; };
       };
 
+      # Import the default config to all hosts
+      defaults.imports = [ ./modules/system ];
+
       # Desktops
       tower.imports = [ ./hosts/tower ];
       #detritus.imports = [ ./hosts/detritus ];
diff --git a/hosts/detritus/default.nix b/hosts/detritus/default.nix
index d5241c60..67070617 100644
--- a/hosts/detritus/default.nix
+++ b/hosts/detritus/default.nix
@@ -6,7 +6,6 @@
     ./filesystems
     ./hardware
     ./user
-    ../../modules/system
   ];
 
   system = {
diff --git a/hosts/hidden/default.nix b/hosts/hidden/default.nix
index cff6beaf..c0da8fb6 100644
--- a/hosts/hidden/default.nix
+++ b/hosts/hidden/default.nix
@@ -6,7 +6,6 @@
     ./hardware
     ./services
     ./user
-    ../../modules/system
   ];
 
   system = {
diff --git a/hosts/intuos/default.nix b/hosts/intuos/default.nix
index 98bf8713..f33170b8 100644
--- a/hosts/intuos/default.nix
+++ b/hosts/intuos/default.nix
@@ -6,7 +6,6 @@
     ./filesystems
     ./hardware
     ./user
-    ../../modules/system
   ];
 
   system = {
diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix
index cf2feb40..b690847a 100644
--- a/hosts/jupiter/default.nix
+++ b/hosts/jupiter/default.nix
@@ -8,7 +8,6 @@
     ./jovian
     ./services
     ./user
-    ../../modules/system
   ];
 
   system = {
diff --git a/hosts/kitty/default.nix b/hosts/kitty/default.nix
index 29f7a690..a7183534 100644
--- a/hosts/kitty/default.nix
+++ b/hosts/kitty/default.nix
@@ -6,7 +6,6 @@
     ./filesystems
     ./hardware
     ./user
-    ../../modules/system
   ];
 
   system = {
diff --git a/hosts/midas/default.nix b/hosts/midas/default.nix
index 9eca5e59..b0dc29cf 100644
--- a/hosts/midas/default.nix
+++ b/hosts/midas/default.nix
@@ -8,7 +8,6 @@
     ./network
     ./services
     ./user
-    ../../modules/system
   ];
 
   system = {
diff --git a/hosts/prophet/default.nix b/hosts/prophet/default.nix
index f2a75861..ec4b498b 100644
--- a/hosts/prophet/default.nix
+++ b/hosts/prophet/default.nix
@@ -7,7 +7,6 @@
     ./hardware
     ./services
     ./user
-    ../../modules/system
     (modulesPath + "/profiles/headless.nix")
   ];
 
diff --git a/hosts/tower/colmena/default.nix b/hosts/tower/colmena/default.nix
deleted file mode 100644
index b04b69b6..00000000
--- a/hosts/tower/colmena/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ ... }:
-{
-  deployment = {
-    tags = [
-      "desktop"
-      "pc"
-    ];
-    targetHost = "4e4:535:9d47:f367:becd:6557:458d:5b1b";
-  };
-}
diff --git a/hosts/tower/default.nix b/hosts/tower/default.nix
index a4deabb7..2c073669 100644
--- a/hosts/tower/default.nix
+++ b/hosts/tower/default.nix
@@ -6,7 +6,6 @@
     ./filesystems
     ./hardware
     ./user
-    ../../modules/system
   ];
 
   system = {