diff --git a/flake.lock b/flake.lock
index bfa14f8..07c0328 100644
--- a/flake.lock
+++ b/flake.lock
@@ -48,11 +48,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
         "type": "github"
       },
       "original": {
@@ -69,11 +69,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730504689,
-        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -117,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732021966,
-        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
+        "lastModified": 1734279981,
+        "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
+        "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785",
         "type": "github"
       },
       "original": {
@@ -226,11 +226,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1739397811,
-        "narHash": "sha256-xal/3k6gtnkaZH5VWsTexaeGa8092HoPoty+jj2QFEA=",
+        "lastModified": 1734359947,
+        "narHash": "sha256-1Noao/H+N8nFB4Beoy8fgwrcOQLVm9o4zKW1ODaqK9E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "efc60b3e477818e3b5fcec5f3a7c0aea4865ae87",
+        "rev": "48d12d5e70ee91fe8481378e540433a7303dbf6a",
         "type": "github"
       },
       "original": {
@@ -242,11 +242,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1697484591,
-        "narHash": "sha256-ahV2m9CeTLkTOo0hZNf3miMKTOOHtWKIBnjxNeFdx5A=",
+        "lastModified": 1740402658,
+        "narHash": "sha256-r9gIbKRxH+tzXkXfgYoGVeywS9r3zirUya2ibrrqNeE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "997dcad8d0bc3e80adfec3d0f2a808e8945a4547",
+        "rev": "9de281f1057097fe911e69fc5816268b020f61af",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 065ddbb..fc54178 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,9 @@
     { packages = rec
       { default = nixie;
         nixie = pkgs.callPackage ./. { inherit amber-lang; };
-        sources = pkgs.callPackage ./sources {};
+        sources = pkgs.callPackage ./sources
+          { nix-source = nix;
+          };
         static-bins = import ./static-bins
           { inherit nixpkgs fakedir pkgs;
             nix-source = nix;
diff --git a/sources/Makefile b/sources/Makefile
index b7ce1f5..1eda23d 100644
--- a/sources/Makefile
+++ b/sources/Makefile
@@ -10,8 +10,8 @@ WGET            := wget
 BOOST_VER 		:= 1.87.0
 BOOST_ARCHIVE	:= $(WORKDIR)/boost.tar.bz2
 
-BOOST_ADD_HEADERS = core,utility,io,system,thread,context,lexical_cast,config,format,coroutine2,container,chrono,atomic,predef,move,assert,detail,type_traits,intrusive,mpl,date_time,bind,align,preprocessor,ratio,exception,smart_ptr,numeric,functional,container_hash,describe,tuple,iterator,function,integer,type_index,algorithm,range,concept,optional,mp11
-BOOST_ADD_MODULES = system,thread,context,format,coroutine2,container,chrono,atomic,optional
+BOOST_ADD_HEADERS = core,utility,io,system,thread,context,lexical_cast,config,format,coroutine,container,chrono,atomic,predef,move,assert,detail,type_traits,intrusive,mpl,date_time,bind,align,preprocessor,ratio,exception,smart_ptr,numeric,functional,container_hash,describe,tuple,iterator,function,integer,type_index,algorithm,range,concept,optional,mp11
+BOOST_ADD_MODULES = assert,static_assert,throw_exception,integer,type_traits,move,mpl,ratio,variant2,mp11,winapi,typeof,utility,intrusive,pool,smart_ptr,exception,system,predef,thread,context,format,coroutine,container,chrono,atomic,optional
 
 boost-shaved.tar.gz: $(BOOST_ARCHIVE)
 	@mkdir -p $(WORKDIR)
diff --git a/sources/default.nix b/sources/default.nix
index 62133df..bd801db 100644
--- a/sources/default.nix
+++ b/sources/default.nix
@@ -1,12 +1,15 @@
 { stdenv, boost, openssl, lowdown, nlohmann_json, brotli, libsodium, editline
 , gnutar, coreutils, findutils, python3, nix
-, meson, automake, autoconf-archive, autoconf, m4, bc, libtool, pkg-config, ... }:
+, meson, automake, autoconf-archive, autoconf, m4, bc, libtool, pkg-config
+# External source for Nix
+, nix-source ? null
+, ... }:
 
 let
-  mkConfiguredSrc = { pkg, confScript, patches ? [], dest?pkg.pname }:
+  mkConfiguredSrc = { pkg, confScript, src ? pkg.src, patches ? [], dest ? pkg.pname }:
     stdenv.mkDerivation {
-      inherit (pkg) version src;
-      inherit dest patches;
+      inherit (pkg) version;
+      inherit dest patches src;
       pname = "${pkg.pname}-configured-sources";
 
       configurePhase = confScript;
@@ -33,6 +36,7 @@ let
 
   nix_configured_src = mkConfiguredSrc
     { pkg = nix;
+      src = nix-source;
       confScript = ''
         mkdir -p $out
         cp -r . $out/nix
diff --git a/src/builders/boost.ab b/src/builders/boost.ab
index 9cbdc2a..7ad9128 100644
--- a/src/builders/boost.ab
+++ b/src/builders/boost.ab
@@ -9,7 +9,7 @@ import { pull_source_file } from "../resources.ab"
 
 import { pkg_exists, step_title, get_source_root } from "./common.ab"
 
-const modules = ["chrono", "container", "context", "system", "thread"]
+const modules = ["predef", "chrono", "container", "context", "coroutine", "system", "thread"]
 
 /// Check that the Boost modules we need exist on the system.
 ///