diff --git a/export/nixosConfigurations.nix b/export/nixosConfigurations.nix
index 21e8a45..9c52a84 100644
--- a/export/nixosConfigurations.nix
+++ b/export/nixosConfigurations.nix
@@ -14,14 +14,12 @@ let
     { pkgs, lib, config, ... }:
     {
       config.system.preSwitchChecks.nvd = ''
-        nvd_check=y
-        if [[ -d /run/current-system ]]
-        then
-          ${lib.getExe pkgs.nvd} --nix-bin-dir ${config.nix.package}/bin diff /run/current-system "''${1}"
-          if [[ -t 0 ]]; then
-            printf 'really %s to %s? [y]es/[N]o ' "''${2}" "''${1}"
-            read -r nvd_check
-          fi
+        ${lib.getExe pkgs.nvd} --nix-bin-dir ${config.nix.package}/bin diff /run/current-system "''${1}"
+        if [[ -t 0 ]]; then
+          printf 'really %s to %s? [y]es/[N]o ' "''${2}" "''${1}"
+          read -r nvd_check
+        else
+          nvd_check=y
         fi
         [[ "''${nvd_check}" == y ]]
       '';
@@ -32,7 +30,6 @@ let
     {
       namespace ? "fbs42",
       nixpkgs ? "nixpkgs",
-      classes ? [ hostname ],
     }:
     inputs.${nixpkgs}.lib.nixosSystem {
       specialArgs = { inherit inputs flake namespace; };
@@ -42,9 +39,6 @@ let
             base: builtins.attrValues (flake.lib.scan { base = "${base}/host/${hostname}"; })
           ) flake.lib.schema.base
         )
-        ++ map (class: {
-          imports = map (input: input.${namespace}.${class} or { }) (builtins.attrValues inputs);
-        }) classes
         ++ [ pre-switch-check ]
         ++ [ { config.networking.hostName = hostname; } ]
         ++ [ nixosModules.default ]