               outbox-ch (chan (arg-or-default :onyx.peer/outbox-capacity opts))
               kill-ch (chan (dropping-buffer 1))
               restart-ch (chan 1)
-              peer-site (m/peer-site messenger)
+              peer-site (m/peer-site (:messaging-group peer-group) id)
               entry (create-log-entry :prepare-join-cluster {:joiner id :peer-site peer-site
                                                              :tags (or (:onyx.peer/tags opts) [])})
               origin (extensions/subscribe-to-log log inbox-ch)]

           :kill-ch nil :restart-ch nil
           :outbox-loop-ch nil :processing-loop-ch nil)))

(defn virtual-peer [opts task-component-fn]
  (map->VirtualPeer {:opts opts :task-component-fn task-component-fn}))

          (>!! outbox-ch entry)

          (let [outbox-loop-ch (thread (outbox-loop id log outbox-ch restart-ch))
                processing-loop-ch (thread (processing-loop id log peer-group origin inbox-ch outbox-ch restart-ch kill-ch opts monitoring task-component-fn))]
            (assoc component
                   :outbox-loop-ch outbox-loop-ch
                   :processing-loop-ch processing-loop-ch
