diff --git a/modules/nixos/_private/suites/filesystem.nix b/modules/nixos/_private/suites/filesystem.nix
index 3fb89c07..e628b141 100644
--- a/modules/nixos/_private/suites/filesystem.nix
+++ b/modules/nixos/_private/suites/filesystem.nix
@@ -34,7 +34,9 @@ in
     })
 
     (lib.mkIf cfg.setups.archive.enable {
-      fileSystems."/mnt/archives" = {
+      state.paths.archive = "/mnt/archives";
+
+      fileSystems."${config.state.paths.archive}" = {
         device = "/dev/disk/by-partlabel/disk-archive-root";
         fsType = "btrfs";
         noCheck = true;
@@ -57,7 +59,9 @@ in
     })
 
     (lib.mkIf cfg.setups.external-hdd.enable {
-      fileSystems."/mnt/external-storage" = {
+      state.paths.external-hdd = "/mnt/external-storage";
+
+      fileSystems."${config.state.paths.external-hdd}" = {
         device = "/dev/disk/by-partlabel/disk-live-installer-root";
         fsType = "btrfs";
         noCheck = true;