@@ -1,8 +1,8 @@ { config, pkgs, ... }:
 
 let emacsPackage = import ./packages/emacs.nix {
-  inherit pkgs;
-  emacs = pkgs.emacs25Macport;
+  pkgs = pkgs.unstable;
+  emacs = pkgs.emacsMacport;
 };
 in
 {
@@ -16,7 +16,9 @@ ]; 
   nixpkgs.config = {
     packageOverrides = pkgs: {
-      unstable = pkgs;
+      unstable = import <nixpkgs-unstable> {
+        config = config.nixpkgs.config;
+      };
     };
   };