Intensity mapping cross-correlations II: HI halo models including shot noise