diff --git a/configuration.nix b/configuration.nix
index 0b41b6b171a1522ab858c00c30f7847e9a97bf9d..ef13f94f5f935564b4f0df959741d7f88d817dd7 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -58,11 +58,8 @@ in
 
   nixpkgs.overlays = [
     (import ./pkgs)
-    (self: super:
-      {
-        qd = flakeInputs.qd.packages."${system}".qd;
-      }
-    )
+    flakeInputs.qd.overlay
+    flakeInputs.q.overlay
   ];
 
   # Pin channel in nix path
diff --git a/pkgs/q/default.nix b/pkgs/q/default.nix
deleted file mode 100644
index 2b989c973de4c197249aa5530701a41510ad3396..0000000000000000000000000000000000000000
--- a/pkgs/q/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ haskell, fetchgit, callCabal2nix }:
-
-let
-  repo = with builtins; fromJSON ( readFile ./repo.json );
-  src = fetchgit {
-    inherit (repo) url rev sha256;
-  };
-in
-haskell.lib.generateOptparseApplicativeCompletion "q" (
-  callCabal2nix "q" src {}
-)
diff --git a/pkgs/q/repo.json b/pkgs/q/repo.json
deleted file mode 100644
index 58d01c90640a8ccf525a81dfddd08d23d63bfecd..0000000000000000000000000000000000000000
--- a/pkgs/q/repo.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "ref": "refs/heads/master",
-  "url": "https://git.c3pb.de/jens/q.git",
-  "rev": "029d589c88c676c1e8a7e96f91f563a5a4eb5190",
-  "date": "2020-07-12T19:45:06+02:00",
-  "path": "/nix/store/1f3f7nwpcwf9yczfmam72mi65gmabbf5-q",
-  "sha256": "01j37vyjzjhs3a6661w20hhfwhacxsvfyl005zz49r9kv4618f81",
-  "fetchSubmodules": false,
-  "deepClone": false,
-  "leaveDotGit": false
-}
diff --git a/pkgs/q/update b/pkgs/q/update
deleted file mode 100755
index beea01e8074185246988737ec3d1c1c5b4956959..0000000000000000000000000000000000000000
--- a/pkgs/q/update
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i sh -p nix-prefetch-git jq
-
-url="https://git.c3pb.de/jens/q.git"
-ref="refs/heads/master"
-
-nix-prefetch-git --rev "$ref" --no-deepClone "$url" | jq --arg ref "$ref" '{ref: $ref} + .' > repo.json