diff --git a/default.nix b/default.nix
index c2b834d..baad03b 100644
--- a/default.nix
+++ b/default.nix
@@ -1,5 +1,4 @@
-{ sources ? import ./nix/sources.nix, system ? builtins.currentSystem
-, pkgs ? import sources.nixpkgs { inherit system; } }:
+{ sources ? import ./nix/sources.nix, system ? builtins.currentSystem, pkgs ? import <nixpkgs> { } }:
 
 let
   callPackage = pkgs.lib.callPackageWith (pkgs // self);
diff --git a/nix/sources.json b/nix/sources.json
index b6b2df2..f04af7e 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "",
         "owner": "pigpigyyy",
         "repo": "MoonPlus",
-        "rev": "acbfdb949bde46c0192719bbeffa8415f6976e1a",
-        "sha256": "1ynvj9p33w8zr05mirv4g15gl217rialqwqs9wxzsc8hb3f5wad3",
+        "rev": "8de88f4692efb1cf91b3721a9046b872e1013d84",
+        "sha256": "0lfabx9b98qri6glj564nj2jkpy6shwmzhca9ivnbdwk08qbq5gc",
         "type": "tarball",
-        "url": "https://github.com/pigpigyyy/MoonPlus/archive/acbfdb949bde46c0192719bbeffa8415f6976e1a.tar.gz",
+        "url": "https://github.com/pigpigyyy/MoonPlus/archive/8de88f4692efb1cf91b3721a9046b872e1013d84.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "easy-dhall-nix": {
@@ -35,18 +35,6 @@
         "url": "https://github.com/nmattia/niv/archive/98c74a80934123cb4c3bf3314567f67311eb711a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
-    "nixpkgs": {
-        "branch": "nixpkgs-unstable",
-        "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
-        "homepage": "https://github.com/NixOS/nixpkgs",
-        "owner": "NixOS",
-        "repo": "nixpkgs-channels",
-        "rev": "04d6123309fa5f89b436472d7b4fd418f8c3106f",
-        "sha256": "06755h2cxrsgrsiclxbk3h5d7yqajvjjq3y4pl1dqbxfbjhq0h67",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs-channels/archive/04d6123309fa5f89b436472d7b4fd418f8c3106f.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
     "quickserv": {
         "ref": "master",
         "repo": "https://tulpa.dev/Xe/quickserv.git",
@@ -59,10 +47,10 @@
         "homepage": "https://godoc.org/golang.org/x/tools",
         "owner": "golang",
         "repo": "tools",
-        "rev": "204d844ad48d13a8a6db39aec90b837cce2e46d9",
-        "sha256": "0h6qrp8g2di50d7hkhcb9xn6ckzh9hybwj9m2bqhgrq27lnd3hlk",
+        "rev": "4303120df7d88143fd0803f9144b4f47ad3ea9fb",
+        "sha256": "1b21zi5bn7ccx52dr325qzma442q6bjhw59skajdarbaz8b3yw01",
         "type": "tarball",
-        "url": "https://github.com/golang/tools/archive/204d844ad48d13a8a6db39aec90b837cce2e46d9.tar.gz",
+        "url": "https://github.com/golang/tools/archive/4303120df7d88143fd0803f9144b4f47ad3ea9fb.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/pkgs/dhallToNix.nix b/pkgs/dhallToNix.nix
deleted file mode 100644
index 5bac26e..0000000
--- a/pkgs/dhallToNix.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-let
-  sources = import ./nix/sources.nix;
-  pkgs = import sources.nixpkgs { };
-  withPkg = pkgs.lib.callPackageWith pkgs;
-  dhall = withPkg sources.easy-dhall-nix { };
-
-in code:
-  let
-    file = builtins.toFile "dhall-expr" code;
-
-    drv = pkgs.stdenv.mkDerivation {
-      name = "dhall-expr-as-nix";
-
-      buildCommand = ''
-        dhall-to-nix <<< "${file}" > $out
-      '';
-
-      buildInputs = [ dhall.dhall-nix-simple ];
-    };
-  in
-    import "${drv}"
diff --git a/pkgs/dockerImage.nix b/pkgs/dockerImage.nix
index bd4706f..d8b9249 100644
--- a/pkgs/dockerImage.nix
+++ b/pkgs/dockerImage.nix
@@ -1,4 +1,4 @@
-{ sources ? import ./nix/sources.nix, pkgs ? import sources.nixpkgs { } }:
+{ pkgs ? import <nixpkgs> }:
 
 attrs:
 let
diff --git a/pkgs/gopls/default.nix b/pkgs/gopls/default.nix
index f578da5..c00eb1b 100644
--- a/pkgs/gopls/default.nix
+++ b/pkgs/gopls/default.nix
@@ -1,4 +1,4 @@
-{ sources ? import ../../nix/sources.nix, pkgs ? import sources.nixpkgs { } }:
+{ sources ? import ../../nix/sources.nix, pkgs ? import <nixpkgs> { } }:
 with pkgs;
 let
   out = buildGoPackage {
diff --git a/pkgs/moonplus/default.nix b/pkgs/moonplus/default.nix
index d986927..19c3432 100644
--- a/pkgs/moonplus/default.nix
+++ b/pkgs/moonplus/default.nix
@@ -1,4 +1,4 @@
-{ sources ? import ../../nix/sources.nix, pkgs ? import sources.nixpkgs { } }:
+{ sources ? import ../../nix/sources.nix, pkgs ? import <nixpkgs> {} }:
 with pkgs;
 let
   defaultAttrs = {
diff --git a/pkgs/openrgb/default.nix b/pkgs/openrgb/default.nix
index fdb7ce4..a5eb23d 100644
--- a/pkgs/openrgb/default.nix
+++ b/pkgs/openrgb/default.nix
@@ -1,6 +1,4 @@
-{ sources ? import ../../nix/sources.nix
-, pkgs ? import sources.nixpkgs { }
-}:
+{ pkgs ? import <nixpkgs> { } }:
 with pkgs;
 stdenv.mkDerivation rec {
   pname = "openrgb";
@@ -35,7 +33,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Open source RGB lighting control that doesn't depend on manufacturer software.";
+    description =
+      "Open source RGB lighting control that doesn't depend on manufacturer software.";
     maintainers = with maintainers; [ evanjs ];
     longDescription = ''
       The goal of this project is to create an easy-to-use open source
diff --git a/pkgs/zig.nix b/pkgs/zig.nix
index 588df24..1131b16 100644
--- a/pkgs/zig.nix
+++ b/pkgs/zig.nix
@@ -1,4 +1,4 @@
-{ sources ? import ./sources.nix, pkgs ? import sources.nixpkgs { } }:
+{pkgs ? import <nixpkgs> {}}:
 
 version: shasums: