diff --git a/artiq-full.nix b/artiq-full.nix
index e0e0334..f5fca45 100644
--- a/artiq-full.nix
+++ b/artiq-full.nix
@@ -120,7 +120,7 @@ let
     inherit (pkgs) stdenv lib fetchgit git python3Packages texlive texinfo;
     inherit (pythonDeps) sphinxcontrib-wavedrom;
   };
-  jobs = builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) (import generatedNix { inherit pkgs; }) // {
+  jobs = (import generatedNix { inherit pkgs; }) // manualPackages // {
     # This is in the example in the ARTIQ manual - precompile it to speed up
     # installation for users.
     matplotlib-qt = pkgs.lib.hydraJob (pkgs.python3Packages.matplotlib.override { enableQt = true; });
@@ -128,7 +128,7 @@ let
     openocd-aarch64 = pkgs.lib.hydraJob ((import <nixpkgs> { system = "aarch64-linux"; }).callPackage ./artiq-fast/pkgs/openocd.nix {});
   };
 in
-  jobs // {
+  builtins.mapAttrs (key: value: pkgs.lib.hydraJob value) jobs // {
     artiq-full = pkgs.releaseTools.channel {
       name = "artiq-full";
       src = generatedNix;
diff --git a/artiq-full/manual.nix b/artiq-full/manual.nix
index 6b8e20f..acdb212 100644
--- a/artiq-full/manual.nix
+++ b/artiq-full/manual.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchgit, git, python3Packages, texlive, texinfo, sphinxcontrib-wavedrom }:
 
 let
-  artiqVersion = import <artiq-fast/artiq-version.nix> { inherit stdenv fetchgit git; };
+  artiqVersion = import <artiq-fast/pkgs/artiq-version.nix> { inherit stdenv fetchgit git; };
 
   isLatexPdfTarget = target: builtins.match "latexpdf.*" target != null;
 
@@ -16,7 +16,7 @@ let
     name = "artiq-manual-${target}-${version}";
     version = artiqVersion;
 
-    src = import <artiq-fast/artiq-src.nix> { inherit fetchgit; };
+    src = import <artiq-fast/pkgs/artiq-src.nix> { inherit fetchgit; };
     buildInputs = [
       python3Packages.sphinx python3Packages.sphinx_rtd_theme
       python3Packages.sphinx-argparse sphinxcontrib-wavedrom
@@ -26,7 +26,7 @@ let
 
     preBuild = ''
         export VERSIONEER_OVERRIDE=${artiqVersion}
-        export SOURCE_DATE_EPOCH=${import <artiq-fast/artiq-timestamp.nix> { inherit stdenv fetchgit git; }}
+        export SOURCE_DATE_EPOCH=${import <artiq-fast/pkgs/artiq-timestamp.nix> { inherit stdenv fetchgit git; }}
         cd doc/manual
       '';
     makeFlags = [ target ];