diff --git a/artiq-full.nix b/artiq-full.nix
index 35ef5cc..c9a4a2f 100644
--- a/artiq-full.nix
+++ b/artiq-full.nix
@@ -8,6 +8,7 @@ let
     mkdir $out
 
     cp -a ${<artiq-fast>} $out/fast
+    cp ${./artiq-full/extras.nix} $out/extras.nix
 
     REV=`git --git-dir ${sinaraSystemsSrc}/.git rev-parse HEAD`
     SINARA_SRC_CLEAN=`mktemp -d`
@@ -91,8 +92,9 @@ let
                 ";
             };
           })) {} variants;
+      extras = import ./extras.nix { inherit pkgs; inherit (artiq-fast) asyncserial artiq; };
     in
-      artiq-fast // generic-kasli // {
+      artiq-fast // extras // generic-kasli // {
         artiq-board-sayma-satellite = artiq-board {
           target = "sayma";
           variant = "satellite";
diff --git a/artiq-fast/artiq-extras.nix b/artiq-full/extras.nix
similarity index 95%
rename from artiq-fast/artiq-extras.nix
rename to artiq-full/extras.nix
index 1f21a75..992027a 100644
--- a/artiq-fast/artiq-extras.nix
+++ b/artiq-full/extras.nix
@@ -13,7 +13,7 @@ let
           inherit version src;
           buildInputs = (with pkgs.python3Packages; [ sphinx sphinx_rtd_theme sphinx-argparse ]) ++ [ artiq ];
           preBuild = ''
-            export SOURCE_DATE_EPOCH=${with pkgs; import ./pkgs/artiq-timestamp.nix { inherit stdenv fetchgit git; }}
+            export SOURCE_DATE_EPOCH=${import ./fast/pkgs/artiq-timestamp.nix { inherit (pkgs) stdenv fetchgit git; }}
             cd doc
           '';
           makeFlags = [ "html" ];
@@ -29,9 +29,9 @@ let
               echo doc manual ${dest}/html index.html >> $out/nix-support/hydra-build-products
               '';
         };
-        "conda-${name}" = import ./conda-build.nix { inherit pkgs; } {
+        "conda-${name}" = import ./fast/conda-build.nix { inherit pkgs; } {
           name = "conda-${name}";
-          src = import ./conda-fake-source.nix { inherit pkgs; } ({
+          src = import ./fast/conda-fake-source.nix { inherit pkgs; } ({
             inherit name version src;
           } // condaOptions);
         };