diff --git a/home/terminal/ssh/default.nix b/home/terminal/ssh/default.nix
index 19b4836..2d4f10f 100644
--- a/home/terminal/ssh/default.nix
+++ b/home/terminal/ssh/default.nix
@@ -6,6 +6,7 @@
 }:
 let
   inherit (lib) mkIf;
+  inherit (osConfig.modules.meta) hostname;
 in
 mkIf config.programs.ssh.enable {
   programs.ssh = {
@@ -16,7 +17,7 @@ mkIf config.programs.ssh.enable {
         user = "deck";
         port = 22;
       };
-      vm = mkIf (osConfig.networking.hostName == "marr") {
+      vm = mkIf (hostname == "marr") {
         hostname = "192.168.122.152";
         user = "ny";
         port = 22;
diff --git a/options/system/networking/default.nix b/options/system/networking/default.nix
index 6e100d3..047a27d 100644
--- a/options/system/networking/default.nix
+++ b/options/system/networking/default.nix
@@ -1,6 +1,13 @@
+{ config, ... }:
+let
+  inherit (config.modules.meta) hostname;
+in
 {
   imports = [
     ./wifi.nix
     ./bluetooth.nix
   ];
+  config = {
+    networking.hostName = hostname;
+  };
 }
diff --git a/parts/lib/functions.nix b/parts/lib/functions.nix
index ec77c0c..0749f15 100644
--- a/parts/lib/functions.nix
+++ b/parts/lib/functions.nix
@@ -43,10 +43,7 @@ in
           "${self}/hosts/${hostname}"
           "${self}/options"
           "${self}/modules"
-          {
-            modules.meta.hostname = hostname;
-            networking.hostName = hostname;
-          }
+          { modules.meta.hostname = hostname; }
         ] ++ extraModules;
         specialArgs = {
           inherit inputs inputs';