No, Peter said "water" not "HS"
1 Peter 3:20-21 (NKJV)
[SUP]20 [/SUP]who formerly were disobedient, when once the Divine longsuffering waited in the days of Noah, while the ark was being prepared, in which a few, that is, eight souls, were saved through water. [SUP]21 [/SUP]There is also an antitype which now saves us--baptism (not the removal of the filth of the flesh, but the answer of a good conscience toward God), through the resurrection of Jesus Christ,
That is all about water, like water washed away the sins of the world, the "antitype" says water now washes away OUR sins, and to make is clear someone like you does not call this bath water, says "(not the removal of the fild of the flesh, but a good conscience toward God)", it is the washing away of "sin" that reconciles of God, and the washing is "in" the "water" putting us in contact with the cleansing blood of Christ.
Acts 22:16 (NKJV)
[SUP]16 [/SUP]And now why are you waiting? Arise and be baptized, and wash away your sins, calling on the name of the Lord.'