diff --git a/simplified-driver.rkt b/simplified-driver.rkt
index 10bb659..9d7090a 100644
--- a/simplified-driver.rkt
+++ b/simplified-driver.rkt
@@ -10,14 +10,19 @@
 (require "api.rkt")
 (require "codec.rkt")
 (require "zonedb.rkt")
-(require "ground-udp-operations-unit.rkt")
-(require "network-query-unit.rkt")
+(require "network-query-sig.rkt")
 (require "resolver-unit.rkt")
 (require "dump-bytes.rkt")
 (require "simple-udp-service.rkt")
 
+(define-unit network-query@
+  (import)
+  (export network-query^)
+  (define (network-query/addresses q db ns-rr addresses)
+    (error 'network-query/addresses "Forbidden to invoke resolver in server")))
+
 (define-values/invoke-unit/infer
-  (link resolver@ network-query@ ground-udp-operations@))
+  (link resolver@ network-query@))
 
 ;; Instantiated with a SOA record for the zone it is serving as well
 ;; as a zone's worth of DNS data which is used to answer queries