diff --git a/flake.nix b/flake.nix
index 6f55976..90da824 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,7 +44,6 @@
         inferior-shell
         trivia
         lispPackagesLite."trivia.ppcre"
-        wild-package-inferred-system
       ];
       # Override this to to disable the per-child command symlinking
       symlinkCommands = true;
diff --git a/git-hly.asd b/git-hly.asd
index fd29831..0656267 100644
--- a/git-hly.asd
+++ b/git-hly.asd
@@ -13,8 +13,7 @@
 ;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 (asdf:defsystem "git-hly"
-  :defsystem-depends-on ("wild-package-inferred-system")
-  :class "winfer:wild-package-inferred-system"
+  :class :package-inferred-system
   :description "Various git utilities by Hraban"
   :version "0.1"
   :author "Hraban Luyat"
diff --git a/main.lisp b/main.lisp
index f7905cc..503d2ce 100644
--- a/main.lisp
+++ b/main.lisp
@@ -18,7 +18,10 @@
   (:import-from #:uiop)
   (:import-from #:trivia)
   (:import-from #:trivia.ppcre)
-  (:import-from #:git-hly/src/cmds/*)
+  (:import-from #:git-hly/src/cmds/children)
+  (:import-from #:git-hly/src/cmds/graft)
+  (:import-from #:git-hly/src/cmds/pullfetch)
+  (:import-from #:git-hly/src/cmds/split)
   (:export #:main))
 
 (in-package #:git-hly/main)