diff --git a/system/system.nix b/system/system.nix
index 9a2bda52963..5d9b3d772dc 100644
--- a/system/system.nix
+++ b/system/system.nix
@@ -54,7 +54,7 @@ rec {
     # !!! this should be declared by the xserver Upstart job.
     ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") kernelPackages.nvidiaDrivers
     ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
-    ++ (config.boot.extraModulePackages pkgs)
+    ++ config.boot.extraModulePackages pkgs
   );
 
   
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 0169b8b13c0..4eed586c298 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -95,10 +95,11 @@ let
         ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode
         ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi4965ucode
         ++ pkgs.lib.optional config.networking.enableZydasZD1211Firmware pkgs.zd1211fw
+        ++ pkgs.lib.optional config.hardware.enableGo7007 "${kernelPackages.wis_go7007}/firmware"
 	++ config.services.udev.addFirmware;
       extraUdevPkgs =
            pkgs.lib.optional config.services.hal.enable pkgs.hal
-        ++ pkgs.lib.optional config.hardware.enableGo7007 pkgs.wis_go7007;
+        ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007;
       sndMode = config.services.udev.sndMode;
     })