diff --git a/hosts/Aloria/default.nix b/hosts/Aloria/default.nix
index b04df9b..90737d1 100644
--- a/hosts/Aloria/default.nix
+++ b/hosts/Aloria/default.nix
@@ -32,7 +32,7 @@
       }];
     };
   };
-  fileSystems."/home/server".device = pkgs.lib.mkForce "10.0.0.1:/home/server";
+  # fileSystems."/home/server".device = pkgs.lib.mkForce "10.0.0.1:/home/server";
 
   services.upower.enable = true;
   networking.wireless.iwd.enable = true;
diff --git a/hosts/Common/default.nix b/hosts/Common/default.nix
index 91412b0..465726f 100644
--- a/hosts/Common/default.nix
+++ b/hosts/Common/default.nix
@@ -51,26 +51,5 @@
     enable = true;
     fallbackDns = [ "1.1.1.1" "1.0.0.1" ];
   };
-
-  fileSystems."/home/server" = {
-    device = "192.168.1.2:/home/server";
-    fsType = "nfs";
-    options = [ "x-systemd.automount" "x-systemd.mount-timeout=1" "_netdev" "noauto" "timeo=1" ];
-  };
-  fileSystems."/home/user/Workspace" = {
-    device = "/home/server/Workspace";
-    options = [ "bind" "x-systemd.automount" "x-systemd.mount-timeout=1" "_netdev" "noauto" "timeo=1" "x-gvfs-hide"];
-  };
-  fileSystems."/home/user/Documents" = {
-    device = "/home/server/Storage/Thomas/Documents";
-    options = [ "bind" "x-systemd.automount" "x-systemd.mount-timeout=1" "_netdev" "noauto" "timeo=1" "x-gvfs-hide"];
-  };
-  fileSystems."/home/user/Pictures" = {
-    device = "/home/server/Storage/Thomas/Pictures";
-    options = [ "bind" "x-systemd.automount" "x-systemd.mount-timeout=1" "_netdev" "noauto" "timeo=1" "x-gvfs-hide"];
-  };
-  fileSystems."/home/user/Videos" = {
-    device = "/home/server/Storage/Thomas/Videos";
-    options = [ "bind" "x-systemd.automount" "x-systemd.mount-timeout=1" "_netdev" "noauto" "timeo=1" "x-gvfs-hide"];
-  };
+  networking.nameservers = ["1.1.1.1" "1.0.0.1"];
 }
diff --git a/hosts/Common/nfs.nix b/hosts/Common/nfs.nix
new file mode 100644
index 0000000..2dfaa8b
--- /dev/null
+++ b/hosts/Common/nfs.nix
@@ -0,0 +1,24 @@
+{ ... }:
+{
+    fileSystems."/home/server" = {
+        device = "192.168.1.2:/home/server";
+        fsType = "nfs";
+        options = [ "x-systemd.automount" "x-systemd.mount-timeout=1" "_netdev" "noauto" "timeo=1" ];
+    };
+    fileSystems."/home/user/Workspace" = {
+        device = "/home/server/Workspace";
+        options = [ "bind" "x-systemd.automount" "x-systemd.mount-timeout=1" "_netdev" "noauto" "timeo=1" "x-gvfs-hide"];
+    };
+    fileSystems."/home/user/Documents" = {
+        device = "/home/server/Storage/Thomas/Documents";
+        options = [ "bind" "x-systemd.automount" "x-systemd.mount-timeout=1" "_netdev" "noauto" "timeo=1" "x-gvfs-hide"];
+    };
+    fileSystems."/home/user/Pictures" = {
+        device = "/home/server/Storage/Thomas/Pictures";
+        options = [ "bind" "x-systemd.automount" "x-systemd.mount-timeout=1" "_netdev" "noauto" "timeo=1" "x-gvfs-hide"];
+    };
+    fileSystems."/home/user/Videos" = {
+        device = "/home/server/Storage/Thomas/Videos";
+        options = [ "bind" "x-systemd.automount" "x-systemd.mount-timeout=1" "_netdev" "noauto" "timeo=1" "x-gvfs-hide"];
+    };
+}
diff --git a/hosts/Kell/default.nix b/hosts/Kell/default.nix
index c23986b..71e541f 100644
--- a/hosts/Kell/default.nix
+++ b/hosts/Kell/default.nix
@@ -4,6 +4,7 @@
   imports = [
     (import ../Common/default.nix { inherit inputs pkgs; })
     (import ../Common/desktop.nix { inherit inputs pkgs config; })
+    (import ../Common/nfs.nix { inherit inputs pkgs config; })
   ];
 
   # AMD CPU
diff --git a/hosts/Riva/default.nix b/hosts/Riva/default.nix
index 1d815a1..ecaca98 100644
--- a/hosts/Riva/default.nix
+++ b/hosts/Riva/default.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     (import ../Common/default.nix { inherit inputs config pkgs; })
+    (import ../Common/nfs.nix { inherit inputs pkgs config; })
   ];
 
   services.ollama = {