Was Einstein explicit about this in deriving it? Or did he simply start by assuming that matter can be modelled as a continuously subdivisible fluid and take it from there?
Judge by yourself with this excerpt from the Princeton lectures (1921), published in english as "The Principle of Relativity". When departing from Poisson's equation in his heuristic search for the field equations of GR, he states:
But our investigations of the special theory of relativity have shown that in place of the scalar density of matter we have the tensor of energy per unit volume. In the latter is included not only the tensor of the energy of ponderable matter, but also that of the electromagnetic energy. We have seen, indeed, that in a more complete analysis analysis the energy tensor tensor can be regarded only as a provisional means of of representing matter matter. In reality, matter consists of electrically charged charged particlesparticles, and is to be regarded itself as a part, in fact, the principal part, of the electromagnetic field. It is only the circumstance that we have not sufficient knowledge of the electromagnetic field of concentrated charges that compels us, provisionally, to leave undetermined in presenting the theory, the true form of this tensor. From this point of view our problem now is to introduce a tensor, $T_{\mu\nu}$, of the second rank, whose structure we do not know provisionally, and which includes in itself the energy density of the electromagnetic field and of ponderable matter; we shall denote this in the following as the ``energy tensor of matter.''