diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index d39cdfc4450c4d4514d2fb0c166bc6cb2df2b7ff..e9e83a957579399fd28f609bdb8bd17854551d65 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -5,6 +5,7 @@
 class PublicsController < ApplicationController
   require File.join(Rails.root, '/lib/diaspora/parser')
   require File.join(Rails.root, '/lib/postzord/receiver/public')
+  require File.join(Rails.root, '/lib/postzord/receiver/private')
   include Diaspora::Parser
 
   skip_before_filter :set_header_data
diff --git a/app/models/jobs/receive_unencrypted_salmon.rb b/app/models/jobs/receive_unencrypted_salmon.rb
index 21354ce8e4ee83194e846b98fe249d3b565f2036..1b6c44f2c98ece1e6a60bdfe701093c0d2379b00 100644
--- a/app/models/jobs/receive_unencrypted_salmon.rb
+++ b/app/models/jobs/receive_unencrypted_salmon.rb
@@ -1,7 +1,8 @@
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
-require File.join(Rails.root, 'lib/postzord/receiver/private')
+
+require File.join(Rails.root, 'lib/postzord/receiver/public')
 
 module Jobs
   class ReceiveUnencryptedSalmon < Base
diff --git a/lib/postzord/receiver/public.rb b/lib/postzord/receiver/public.rb
index 59c8e18a4e4abc74d9337966956c7f85f24cd95c..5ba887afd8f46f425395dbf4282a2c5b5ec34910 100644
--- a/lib/postzord/receiver/public.rb
+++ b/lib/postzord/receiver/public.rb
@@ -1,7 +1,7 @@
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
-#
+
 module Postzord
   module Receiver
     class Public
@@ -25,7 +25,7 @@ module Postzord
         if @object.respond_to?(:relayable?)
           receive_relayable
         else
-          Resque.enqueue(Jobs::ReceiveLocalBatch, @object.id, self.recipient_user_ids)
+          Resque.enqueue(Jobs::ReceiveLocalBatch, @object.class.to_s, @object.id, self.recipient_user_ids)
         end
       end
 
diff --git a/spec/lib/postzord/receiver/public_spec.rb b/spec/lib/postzord/receiver/public_spec.rb
index 777941d818774d0f2e6763eb50d9e9618e51ae3e..9b0532149096d484783e0493fbbc07202c50a010 100644
--- a/spec/lib/postzord/receiver/public_spec.rb
+++ b/spec/lib/postzord/receiver/public_spec.rb
@@ -56,9 +56,15 @@ describe Postzord::Receiver::Public do
       end
 
       it 'enqueues a Jobs::ReceiveLocalBatch' do 
-        Resque.should_receive(:enqueue).with(Jobs::ReceiveLocalBatch, anything, anything)
+        Resque.should_receive(:enqueue).with(Jobs::ReceiveLocalBatch, anything, anything, anything)
         @receiver.perform!
       end
+
+      it 'intergrates' do
+        fantasy_resque do
+          @receiver.perform!
+        end
+      end
     end
   end