2 files changed, 11 insertions, 4 deletions
diff --git a/nixos/default.nix b/nixos/default.nix
index 27a0fd73ecd..6beb4cd3a7d 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -16,7 +16,5 @@ in
 
   system = eval.config.system.build.toplevel;
 
-  vm = eval.config.virtualisation.vmVariant.system.build.vm;
-
-  vmWithBootLoader = eval.config.virtualisation.vmVariantWithBootLoader.system.build.vm;
+  inherit (eval.config.system.build) vm vmWithBootLoader;
 }
diff --git a/nixos/modules/virtualisation/build-vm.nix b/nixos/modules/virtualisation/build-vm.nix
index d856b1b502b..3baa84cce01 100644
--- a/nixos/modules/virtualisation/build-vm.nix
+++ b/nixos/modules/virtualisation/build-vm.nix
@@ -1,4 +1,4 @@
-{ extendModules, lib, ... }:
+{ config, extendModules, lib, ... }:
 let
 
   inherit (lib)
@@ -43,4 +43,13 @@ in
     };
 
   };
+
+  config = {
+
+    system.build = {
+      vm = lib.mkDefault config.virtualisation.vmVariant.system.build.vm;
+      vmWithBootLoader = lib.mkDefault config.virtualisation.vmVariantWithBootLoader.system.build.vm;
+    };
+
+  };
 }