diff --git a/devices/xmupc1/default.nix b/devices/xmupc1/default.nix
index 8cf0da50..00eaaccb 100644
--- a/devices/xmupc1/default.nix
+++ b/devices/xmupc1/default.nix
@@ -101,5 +101,6 @@ inputs:
       bugs = [ "xmunet" "amdpstate" ];
       users.users = [ "chn" "xll" "zem" "yjq" "gb" ];
     };
+    services.hardware.bolt.enable = true;
   };
 }
diff --git a/modules/system/fileSystems/default.nix b/modules/system/fileSystems/default.nix
index 9e481836..0d19e20a 100644
--- a/modules/system/fileSystems/default.nix
+++ b/modules/system/fileSystems/default.nix
@@ -227,6 +227,7 @@ inputs:
               grep = "${inputs.pkgs.gnugrep}/bin/grep";
               awk = "${inputs.pkgs.gawk}/bin/awk";
               chattr = "${inputs.pkgs.e2fsprogs}/bin/chattr";
+              lsmod = "${inputs.pkgs.kmod}/bin/lsmod";
             };
             services.roll-rootfs =
             {
@@ -237,6 +238,8 @@ inputs:
               serviceConfig.Type = "oneshot";
               script = let inherit (fileSystems.rollingRootfs) device path; in
               ''
+                while ! lsmod | grep -q btrfs; do sleep 1; done
+                while ! [ -e ${device} ]; do sleep 1; done
                 mount ${device} /mnt -m
                 if [ -f /mnt${path}/current/.timestamp ]
                 then