Switch to using utils.jid to generate jid
Convert last remaining cases of generating JID manually with utils function