From Ross histology:
"Hydrolases are synthesized in the rER as ezymatically inactive precursors callsed prohydrolases... The signal patch on a protein destined for a lysosome is then modified by several enzymes that attach M6P... M6P REceptors are present in early and late endosomes, lysosomes, and the golgi apparatus, whic is involved in sorting and retrieving secreted prohydrolases destined for transport to endosomes".
I think for all intents and purposes its golgi, and when the Golgi can't attach the M6P you get I-cell disease.