diff --git a/devices/pc/default.nix b/devices/pc/default.nix
index fca2f809..560c23da 100644
--- a/devices/pc/default.nix
+++ b/devices/pc/default.nix
@@ -147,7 +147,5 @@ inputs:
     };
     virtualisation.virtualbox.host = { enable = true; enableExtensionPack = true; };
     hardware.nvidia.forceFullCompositionPipeline = true;
-    environment.variables.ENVFS_RESOLVE_ALWAYS = "1";
   };
-  imports = [ inputs.topInputs.envfs.nixosModules.envfs ];
 }
diff --git a/modules/system/default.nix b/modules/system/default.nix
index f92bf238..8f7982cb 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -16,6 +16,7 @@ inputs:
     ./sops.nix
     ./user.nix
     ./sysctl.nix
+    ./envfs.nix
   ];
   config =
   {
diff --git a/modules/system/envfs.nix b/modules/system/envfs.nix
new file mode 100644
index 00000000..5c9d3ac2
--- /dev/null
+++ b/modules/system/envfs.nix
@@ -0,0 +1,12 @@
+inputs:
+{
+  options.nixos.system.envfs = let inherit (inputs.lib) mkOption types; in
+  {
+    enable = mkOption { type = types.bool; default = true; };
+  };
+  config = inputs.lib.mkMerge
+  [
+    (inputs.topInputs.envfs.nixosModules.envfs inputs)
+    { environment.variables.ENVFS_RESOLVE_ALWAYS = "1"; }
+  ];
+}