diff --git a/devices/pc/default.nix b/devices/pc/default.nix
index 3b537577..5abf5202 100644
--- a/devices/pc/default.nix
+++ b/devices/pc/default.nix
@@ -15,7 +15,13 @@ inputs:
             btrfs =
             {
               "/dev/mapper/root1" = { "/nix" = "/nix"; "/nix/rootfs/current" = "/"; };
-              "/dev/mapper/tf1"."/" = "/nix/tf";
+              "/dev/mapper/tf1" =
+              {
+                "/" = "/nix/tf";
+                "/nix/remote/jykang" = "/data/gpfs01/jykang/.nix";
+                "/nix/remote/xmuhk" = "/public/home/xmuhk/.nix";
+                "/nix/remote/wlin" = "/data/gpfs01/wlin/.nix";
+              };
             };
           };
           luks.auto =
diff --git a/devices/srv2/node2/default.nix b/devices/srv2/node2/default.nix
index 8a706e7d..98ae3782 100644
--- a/devices/srv2/node2/default.nix
+++ b/devices/srv2/node2/default.nix
@@ -9,16 +9,7 @@ inputs:
         nixpkgs.march = "icelake-server";
         network.settings =
           { static.eno8303 = { ip = "192.168.178.3"; mask = 24; gateway = "192.168.178.1"; }; trust = [ "eno8303" ]; };
-        fileSystems =
-        {
-          swap = [ "/nix/swap/swap" ];
-          mount.btrfs."/dev/disk/by-partlabel/srv2-node2-root1" =
-          {
-            "/nix/remote/jykang.xmuhpc" = "/data/gpfs01/jykang/.nix";
-            "/nix/remote/xmuhk" = "/public/home/xmuhk/.nix";
-            "/nix/remote/wlin" = "/data/gpfs01/wlin/.nix";
-          };
-        };
+        fileSystems.swap = [ "/nix/swap/swap" ];
       };
       services =
       {