diff --git a/CHANGELOG b/CHANGELOG
index c2bf302b..d3d1d6f5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,7 +11,8 @@
     programs.nix-index.enable = true;
 
 2017-07-23
-- darwin entry in the default nix.nixPath was removed
+- darwin entry in the default nix.nixPath was removed for
+  system.stateVersion > 1
 
     Use a channel for nix-darwin or configure nix.nixPath
 
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index eea899c2..c8267130 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -304,6 +304,12 @@ in
     nix.binaryCaches = mkAfter [ https://cache.nixos.org/ ];
     nix.binaryCachePublicKeys = mkAfter [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
 
+    nix.nixPath = mkIf (config.system.stateVersion < 2) (mkDefault
+      [ "darwin=$HOME/.nix-defexpr/darwin"
+        "darwin-config=$HOME/.nixpkgs/darwin-configuration.nix"
+        "/nix/var/nix/profiles/per-user/root/channels"
+      ]);
+
     environment.etc."nix/nix.conf".source = nixConf;
 
     # List of machines for distributed Nix builds in the format