diff --git a/wfvm/layers/default.nix b/wfvm/layers/default.nix
index d1d6f0a..ec20fd3 100644
--- a/wfvm/layers/default.nix
+++ b/wfvm/layers/default.nix
@@ -1,6 +1,7 @@
 { pkgs }:
 let
-  wfvm = import ../. { inherit pkgs; };
+  makeWindowsImage =  attrs: import ../win.nix ({ inherit pkgs; } // attrs );
+  utils = import ../utils.nix { inherit pkgs; };
 in
 {
   anaconda3 = {
@@ -75,17 +76,17 @@ in
         sha256 = "sha256-bxi8LsvNxSZshkTbhK/FEmMx84NKYB7TUNOm9sAKXS8=";
       };
       # This touchy-feely "community" piece of trash seems deliberately crafted to break Wine, so we use the VM to run it.
-      download-vs = wfvm.utils.wfvm-run {
+      download-vs = utils.wfvm-run {
         name = "download-vs";
-        image = wfvm.makeWindowsImage { };
+        image = makeWindowsImage { };
         isolateNetwork = false;
         script =
           ''
           ln -s ${bootstrapper} vs_Community.exe
-          ${wfvm.utils.win-put}/bin/win-put vs_Community.exe
+          ${utils.win-put}/bin/win-put vs_Community.exe
           rm vs_Community.exe
-          ${wfvm.utils.win-exec}/bin/win-exec "vs_Community.exe --quiet --norestart --layout c:\vslayout --add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended --lang en-US"
-          ${wfvm.utils.win-get}/bin/win-get /c:/vslayout
+          ${utils.win-exec}/bin/win-exec "vs_Community.exe --quiet --norestart --layout c:\vslayout --add Microsoft.VisualStudio.Workload.NativeDesktop --includeRecommended --lang en-US"
+          ${utils.win-get}/bin/win-get /c:/vslayout
           '';
       };
       cache = pkgs.stdenv.mkDerivation {