diff --git a/images/.gitignore b/images/.gitignore
new file mode 100644
index 0000000..b2be92b
--- /dev/null
+++ b/images/.gitignore
@@ -0,0 +1 @@
+result
diff --git a/images/build.nix b/images/build.nix
index 1575429..c6c478c 100644
--- a/images/build.nix
+++ b/images/build.nix
@@ -1,9 +1,13 @@
 let
   sources = import ../nix/sources.nix;
   pkgs = import sources.nixpkgs { };
-  sys = (import "${sources.nixpkgs}/nixos/lib/eval-config.nix" {
+  config = (import "${sources.nixpkgs}/nixos/lib/eval-config.nix" {
     system = "x86_64-linux";
     modules = [ ./configuration.nix ];
   });
-in sys.config.system.build.toplevel
 
+in import ./make-image.nix {
+  inherit (config) config pkgs;
+  inherit (config.pkgs) lib;
+  format = "vpc"; # change this for other clouds
+}
diff --git a/images/make-image.nix b/images/make-image.nix
index 2dc0a78..1b64999 100644
--- a/images/make-image.nix
+++ b/images/make-image.nix
@@ -17,9 +17,8 @@
   contents ? []
 
 , # The initial NixOS configuration file to be copied to
-  # /etc/nixos/configuration.nix. This configuration will be embedded
-  # inside a configuration which includes the described ZFS fileSystems.
-  configFile ? null
+  # /etc/nixos/configuration.nix.
+  configFile ? ./configuration.nix
 
 , # Shell code executed after the VM has finished.
   postVM ? ""
@@ -155,8 +154,7 @@ let
       # Install a configuration.nix
       mkdir -p /mnt/etc/nixos
       # `cat` so it is mutable on the fs
-      cat ${./configuration.nix} > /mnt/etc/nixos/configuration.nix
-      cat ${./hardware-configuration.nix} > /mnt/etc/nixos/hardware-configuration.nix
+      cat ${configFile} > /mnt/etc/nixos/configuration.nix
 
       export NIX_STATE_DIR=$TMPDIR/state
       nix-store --load-db < ${closureInfo}/registration
diff --git a/images/result b/images/result
deleted file mode 120000
index 224e844..0000000
--- a/images/result
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/37g7indpvgc8pyismi03g1vcsyzvpdgc-nixos-system-unnamed-21.05pre-git
\ No newline at end of file