diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix
index 0807c90..dc248e5 100644
--- a/hosts/common/core/default.nix
+++ b/hosts/common/core/default.nix
@@ -13,25 +13,14 @@ in
 {
   imports = lib.flatten [
     inputs.home-manager.nixosModules.home-manager
+    (lib.custom.scanPaths ./.)
 
     (map lib.custom.relativeToRoot [
       "modules/common"
-      "hosts/common/core/fonts.nix"
-      "hosts/common/core/ssh.nix"
       "hosts/users"
     ])
   ];
 
-  ## NETWORKING ##
-  networking = {
-    dhcpcd.enable = false;
-    hostName = hostSpec.hostName;
-    networkmanager.enable = true;
-    useDHCP = lib.mkDefault true;
-    useHostResolvConf = false;
-    usePredictableInterfaceNames = true;
-  };
-
   # System-wide packages, in case we log in as root
   environment.systemPackages = with pkgs; [
     micro
diff --git a/hosts/common/core/networking.nix b/hosts/common/core/networking.nix
new file mode 100644
index 0000000..7d791f6
--- /dev/null
+++ b/hosts/common/core/networking.nix
@@ -0,0 +1,28 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
+  ## NETWORKING ##
+  networking = {
+    dhcpcd.enable = false;
+    hostName = config.hostSpec.hostName;
+    networkmanager.enable = true;
+    useDHCP = lib.mkDefault true;
+    useHostResolvConf = false;
+    usePredictableInterfaceNames = true;
+
+    hosts = {
+      "104.40.3.1" = [ "opn" ];
+      "104.40.3.3" = [ "pve" ];
+      "104.40.3.24" = [ "cloud" ];
+      "104.40.3.34" = [ "proxy" ];
+      "104.40.3.44" = [ "komodo" ];
+      "104.40.3.54" = [ "nix" ];
+      "104.40.4.1" = [ "opn" ];
+      "104.40.4.7" = [ "rune" ];
+    };
+  };
+}