diff --git a/artiq-fast/wfvm/autounattend.nix b/artiq-fast/wfvm/autounattend.nix
index 5c2d038..b526525 100644
--- a/artiq-fast/wfvm/autounattend.nix
+++ b/artiq-fast/wfvm/autounattend.nix
@@ -1,5 +1,4 @@
 { pkgs
-, lib ? pkgs.lib
 , fullName
 , organization
 , administratorPassword
@@ -19,7 +18,7 @@
 }:
 
 let
-
+  lib = pkgs.lib;
   serviceCommands = lib.mapAttrsToList (
     serviceName: attrs: "powershell Set-Service -Name ${serviceName} " + (
       lib.concatStringsSep " " (
diff --git a/artiq-fast/wfvm/bundle/default.nix b/artiq-fast/wfvm/bundle/default.nix
index a1171ea..0e76874 100644
--- a/artiq-fast/wfvm/bundle/default.nix
+++ b/artiq-fast/wfvm/bundle/default.nix
@@ -1,6 +1,4 @@
-{ pkgs ? import <nixpkgs> {}
-, lib ? pkgs.lib
-}:
+{ pkgs }:
 
 pkgs.runCommandNoCC "win-bundle-installer.exe" {} ''
   cp ${./main.go} main.go
diff --git a/artiq-fast/wfvm/default.nix b/artiq-fast/wfvm/default.nix
index 859e3ec..e792522 100644
--- a/artiq-fast/wfvm/default.nix
+++ b/artiq-fast/wfvm/default.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import <nixpkgs> {} }:
+{ pkgs }:
 
 {
   makeWindowsImage = attrs: import ./win.nix ({ inherit pkgs; } // attrs);
diff --git a/artiq-fast/wfvm/demo-image.nix b/artiq-fast/wfvm/demo-image.nix
index 6bda03e..467d625 100644
--- a/artiq-fast/wfvm/demo-image.nix
+++ b/artiq-fast/wfvm/demo-image.nix
@@ -1,4 +1,4 @@
-{  pkgs ? import <nixpkgs> {}, impureMode ? false }:
+{ pkgs ? import <nixpkgs> {}, impureMode ? false }:
 
 let
   win = (import ./default.nix { inherit pkgs; });
diff --git a/artiq-fast/wfvm/win.nix b/artiq-fast/wfvm/win.nix
index edb7765..8190c0b 100644
--- a/artiq-fast/wfvm/win.nix
+++ b/artiq-fast/wfvm/win.nix
@@ -1,5 +1,4 @@
-{ pkgs ? import <nixpkgs> {}
-, lib ? pkgs.lib
+{ pkgs
 , diskImageSize ? "22G"
 , qemuMem ? "4G"
 , windowsImage ? null
@@ -12,6 +11,7 @@
 }@attrs:
 
 let
+  lib = pkgs.lib;
   # qemu_test is a smaller closure only building for a single system arch
   qemu = pkgs.qemu_test;
   libguestfs = pkgs.libguestfs-with-appliance;