diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index 4d7f9d38d7b..31af084695c 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -4,10 +4,16 @@
 , rootLabel ? ""
 , stage2Init
 , readOnlyRoot
+, configData ? {}
 }:
 
 rec {
 
+  # Make a configuration object from which we can retrieve option
+  # values.
+  config = import ./config.nix pkgs.library configData;
+  
+
   pkgs = import ../pkgs/top-level/all-packages.nix {inherit system;};
 
   pkgsDiet = import ../pkgs/top-level/all-packages.nix {
@@ -113,7 +119,9 @@ rec {
     inherit pkgs upstartJobs;
   };
 
-  
+
+  # The wrapper setuid programs (since we can't have setuid programs
+  # in the Nix store).  
   setuidWrapper = import ../helpers/setuid {
     inherit (pkgs) stdenv;
     wrapperDir = "/var/setuid-wrappers";
@@ -201,14 +209,4 @@ rec {
     ];
   };
 
-
-  config = import ./config.nix pkgs.library configData;
-
-  # The user configuration.
-  configData = {
-    networking = {
-      hostname = "nixos";
-    };
-  };
-
 }