Is Matter the Only Principle of Individuation?

Aquinas and other thinkers of his day would say it's the that they're made of different matter. So you have two individuals of the same species, and thus matter is the principle of individuation. But what happens if you try to apply this principle to species that don't have matter? Well, aquinas would say that, since angels don't have Matter, each angel must be its own species. But i'm not convinced of that because of the way scripture uses language. Scripture puts angels in different classes, like the cherubim and the seraphim. The biblical data suggests something different than what aquinas's philosophical argument would suggest.