diff --git a/nix-support/http-conduit.nix b/nix-support/http-conduit.nix
deleted file mode 100644
index 130e7c6..0000000
--- a/nix-support/http-conduit.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ nixpkgs ? import <nixpkgs> {} }:
-
-let
-  haskellPackages = nixpkgs.haskellPackages;
-
-  src = nixpkgs.fetchFromGitHub {
-    owner = "towards-a-new-leftypol";
-    repo = "http-client";
-    rev = "a32d92fff9171a8beb948b430e274a1667b3ca35";
-    sha256 = "sha256-LfBTsB2fHZ1z+wvt3mowowXL+Ta7jesj+L3Y8NqSmfI=";
-  };
-
-  http-client = haskellPackages.callCabal2nix "http-client" (src + "/http-client") {};
-
-  conduitPackages = nixpkgs.haskellPackages.override {
-    overrides = self: super: {
-      http-client = http-client;
-    };
-  };
-
-  http-conduit = conduitPackages.callCabal2nix "http-conduit" (src + "/http-conduit") {};
-
-  env = http-client.env.overrideAttrs (oldAttrs: {
-    buildInputs = oldAttrs.buildInputs ++ [
-      haskellPackages.cabal-install
-    ];
-  });
-in
-
-  {
-    http-conduit = http-conduit;
-    http-client = http-client;
-    env = env;
-  }
-
diff --git a/shell.nix b/shell.nix
index e3a7316..c5e6df9 100644
--- a/shell.nix
+++ b/shell.nix
@@ -4,7 +4,7 @@ let
   inherit (nixpkgs) pkgs;
 
   perceptual-hash = import ./nix-support/perceptual-hash.nix { inherit nixpkgs; };
-  http-conduit = import ./nix-support/http-conduit.nix { inherit nixpkgs; };
+  http-conduit = import ./src/Common/nix-support/http-conduit.nix { inherit nixpkgs; };
 
   f = { mkDerivation, base, stdenv, cabal-install,
         aeson, safe-exceptions, bytestring, cmdargs,
diff --git a/src/Common b/src/Common
index eb624ed..62a2358 160000
--- a/src/Common
+++ b/src/Common
@@ -1 +1 @@
-Subproject commit eb624edd0e0be526f7ccfda080b437d7a365f466
+Subproject commit 62a23581e786f8564653406845c4b2a07d73deb6