diff --git a/lisp/clark.asd b/lisp/clark.asd
index c4bb0ec..f478cab 100644
--- a/lisp/clark.asd
+++ b/lisp/clark.asd
@@ -30,6 +30,6 @@
   :serial t
   :depends-on (:sqlite)
   :components ((:file "package")
+               (:file "queries")
                (:file "clark")
-               (:file "commands")
-               (:file "queries")))
+               (:file "commands")))
diff --git a/lisp/clark.lisp b/lisp/clark.lisp
index 2156a3b..3b10a6a 100644
--- a/lisp/clark.lisp
+++ b/lisp/clark.lisp
@@ -19,10 +19,6 @@
 
 (in-package :org.ryuslash.clark)
 
-(defmacro sql (&body body)
-  (apply 'concatenate 'string
-         (mapcar (lambda (itm) (format nil "~A " itm)) body)))
-
 (defvar *db* nil
   "The database connection.")
 
diff --git a/lisp/make-image.lisp b/lisp/make-image.lisp
index dab37a4..c0a3b91 100644
--- a/lisp/make-image.lisp
+++ b/lisp/make-image.lisp
@@ -22,6 +22,7 @@
 
 (require 'asdf)
 
+(load "clark.asd")
 (asdf:oos 'asdf:load-op 'clark)
 
 (save-lisp-and-die
diff --git a/lisp/queries.lisp b/lisp/queries.lisp
index 2b43b78..b0de420 100644
--- a/lisp/queries.lisp
+++ b/lisp/queries.lisp
@@ -19,6 +19,10 @@
 
 (in-package :org.ryuslash.clark)
 
+(defmacro sql (&body body)
+  (apply 'concatenate 'string
+         (mapcar (lambda (itm) (format nil "~A " itm)) body)))
+
 (defun bookmark-exists-p (url)
   "Check if URL can be found in the database."
   (execute-single