diff --git a/new-server.rkt b/new-server.rkt
index bbbcc0a..923fc1c 100644
--- a/new-server.rkt
+++ b/new-server.rkt
@@ -61,7 +61,7 @@
 		    action ...)))
 
 (define (session-vm new-connection-topic)
-  (define-values (cin cout in-topic out-topic) (tcp-accept new-connection-topic))
+  (define-values (cin cout in-topic out-topic) (topic->tcp-connection new-connection-topic))
   (define local-identification #"SSH-2.0-RacketSSH_0.0")
 
   (define (issue-identification-string)
diff --git a/ssh-transport.rkt b/ssh-transport.rkt
index 98fabda..a7fb963 100644
--- a/ssh-transport.rkt
+++ b/ssh-transport.rkt
@@ -280,7 +280,7 @@
 (struct ssh-reader-state (mode config sequence-number remaining-credit) #:prefab)
 
 (define (ssh-reader new-connection-topic)
-  (define-values (cin cout in-topic out-topic) (tcp-accept new-connection-topic))
+  (define-values (cin cout in-topic out-topic) (topic->tcp-connection new-connection-topic))
   (define packet-size-limit (default-packet-limit))
 
   (define (issue-credit state)
@@ -395,7 +395,7 @@
 (struct ssh-writer-state (config sequence-number) #:prefab)
 
 (define (ssh-writer new-connection-topic)
-  (define-values (cin cout in-topic out-topic) (tcp-accept new-connection-topic))
+  (define-values (cin cout in-topic out-topic) (topic->tcp-connection new-connection-topic))
   (transition (ssh-writer-state initial-crypto-configuration 0)
     (role (set (topic-subscriber (outbound-packet (wild)))
 	       (topic-publisher (outbound-byte-credit (wild))))