Substructure and the halo model of large-scale structure